(merge_face_heights): Coerce back to int explicitly.

diff --git a/src/xfaces.c b/src/xfaces.c
index 8e4472964afb8640304bd87c188b42da3bc5db38..f1477fdea4c9bf0078e549213a7c5c1970101d56 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3240,7 +3240,7 @@ merge_face_heights (from, to, invalid, gcpro)
     {
       if (INTEGERP (to))
        /* relative X absolute => absolute */
-       result = make_number (XFLOAT_DATA (from) * XINT (to));
+       result = make_number ((EMACS_INT)(XFLOAT_DATA (from) * XINT (to)));
       else if (FLOATP (to))
        /* relative X relative => relative */
        result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to));